Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc etc/NEWS
Simple merge

diff --cc lisp/cus-dep.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge